am: 0612a604 Change-Id: Icda201a894bad97b92da6c91f749e634158ba841
mentioned in commit 5e288e43
mentioned in commit e487d780