am: ea7c7c2a Change-Id: I93c9c34bf322f12cd7e2ac506a2c385f7dee2e48
mentioned in commit 6cb12b35
mentioned in commit 09f508ad