Bug: 19704432 (cherry-picked from commit 9102f5d953) Change-Id: I64a2c85beef115158feed3953deae32f692e750f
9102f5d953