am: 1b640e99 Change-Id: Ied820a06b3e57d4808f8f297ee1abaddf12f1542
mentioned in commit 8eb057fe
mentioned in commit bfb10133