am: 824c5b74 Change-Id: I273c7a76970a4ec734b5094a4ef45fab8e82e4c3
mentioned in commit 226f4ba7
mentioned in commit 505c1c93