Bug: 18186310 (cherry picked from commit ecf532fa) Change-Id: Ia12f2fa28c8cd3204eb7d6b4c7d872f4e81fb8ef