am: ede65822 Change-Id: I3982701e8b37ae85e05b1336e454aad5a7d4062e
mentioned in commit d4979a37
mentioned in commit 00175dca