Bug: 27426743 (cherry picked from commit 6c69351469) Change-Id: I7276e39951d721704726132281c316c77bdab515
6c69351469