Bug: 111615259 Change-Id: I4f077688a9cd10aa350670be79b00b44488ba65b
mentioned in commit 9af544b6
mentioned in commit f6159ec1