Bug: 124234733 Change-Id: I663abc6dedaa2080a561bf619b2dfb15a50f02f2
mentioned in commit 5e1d46a0
mentioned in commit 82ebb01c