Bug: 12473154 (cherry-pick from commit a46a9d36) Change-Id: I26e3204ae49b31b9f73292adec6365890f0ea2c0