Bug: 17962997 Bug: 17750026 (cherry picked from commit 95d1a131) Change-Id: I75caa1d9a19b402b050b9230df58c67bd1b107dd