Bug: 17185619, 15358152 (cherry picked from commit 60ffbcac) Change-Id: I08faa0b7368834e264ef05b4ea3bce1c3237876a