Closes-Bug: #2102039 Change-Id: I632937e06683cc76e78390a4e6f3de4e3c4f1f87 (cherry picked from commit 1458330d3b)
1458330d3b