am: 61625604 Change-Id: Ia6760daecd335d0d3f6f80914090d0f62f3ed492
mentioned in commit 44245b30
mentioned in commit e2d9462e