(cherry picked from Master, commit 8359ac20a5) Bug: 17887760 Change-Id: Ibe7d1f2b9189ecee7867a2448790eddb151bd61a
8359ac20a5
Bug: 5475117 Change-Id: I94c70800e272e28c080edd5102adceabf06d7aff