b47a99e3cc
Bug: 159659393
Change-Id: If98d54b7ca397ef56a5c6d50c0fd92f25a9494b4
(cherry picked from commit efb7e60edc)