Bug: 15387103 (cherry picked from commit 625993dfbb) Change-Id: I0e156d7049ba1495902259071a96936592e74025
625993dfbb