Bug: 112535855 Change-Id: I1f1f2f8f6588c49411186404505841bbca8119a4
mentioned in commit ff7783ff
mentioned in commit c5cb8f6b