am: 77adac31 Change-Id: I505c2eb0e0527da6e1eebcace7cd141d75cfae47
mentioned in commit 5359b3a9
mentioned in commit e8ba4e21