am: 76deef78 Change-Id: I8c88a66c442b802afafb2694257dbfa705f991d8
mentioned in commit da2c7981
mentioned in commit 9b8fa116