am: 4820e897 Change-Id: I9894c59af9ff6f788170a702827fa10142c57255
mentioned in commit 742259a1
mentioned in commit ba2264cf