am: 58740f2f Change-Id: Ia6688782c45b96f7fe5f746e24899cf327013a91
mentioned in commit e0c0690e
mentioned in commit 37b5b03f