am: 6ea74177 Change-Id: I395e92856609753f068a68f92efe3632a4e79c09
mentioned in commit 40758bb0
mentioned in commit 7ee62db3