Bug: 111615259 Change-Id: I2b8ec82484f37334663c4879a2cf5b38ee92ce93
mentioned in commit 3eae0090
mentioned in commit 8481f38a