Bug: 124234733 Change-Id: I2a6d60b2b16bdd7cb78a3cf5f838b1299f1d70df
mentioned in commit e1d1f402
mentioned in commit da56a187