Test: N/A Bug: 111830148 Change-Id: I3e1cdfe0cbf4174e7fffa1af82874265758a1035
mentioned in commit 656990da
mentioned in commit eca08bfe
mentioned in commit 7c1be5cb