am: b82e0d16 Change-Id: I766f8c820c19e0e000615ed6f4f9e18a09b1aea1
mentioned in commit 0c68d9d7
mentioned in commit e09e4283