am: 603ce172 Change-Id: I6334eb1b36dfc53e03683ce58f9ccaf1213470d4
mentioned in commit 7b779244
mentioned in commit acd09985