am: 0f7506c9 Change-Id: I7c3406970f3b59284df5cc60b67221b1d09bd140
mentioned in commit 64560fa2
mentioned in commit 17c679b6