am: bcce6005 Change-Id: I2498adf10da7e35d44488ffbf808bf44986374cf
mentioned in commit e07d8cf8
mentioned in commit c0e599fe