am: b06102ab Change-Id: I8f7440a309a137c85c5dfb7dd83622875e856597
mentioned in commit f4111c43
mentioned in commit a7d24ebb