am: a4ef87f7 Change-Id: If60e389091672f985c384af681894aa3e17a65c4
mentioned in commit 3a2f4a48
mentioned in commit ae7c39b5