am: 5a57bd3e Change-Id: I36633bf682a123660849978772c31de6c65d9ee5
mentioned in commit 8d1884e4
mentioned in commit e4ce3588