am: ee7bc7bb Change-Id: I9a2652d224e129c86efdf16ca224516f048bde39
mentioned in commit 01f1fa7b
mentioned in commit 11287158