am: 24c70d0d Change-Id: Id443c69dd791e323470c663d96ec16a5b9b5d155
mentioned in commit 7b779244
mentioned in commit 3a512d9b