am: 26c472ff Change-Id: I1a4e0149e02940872ccdad7a81f5cf0740113c6d
mentioned in commit a16385c8
mentioned in commit db0938ed