am: e76e272f Change-Id: I96cad355c93af95847ca0d314174e72dad2c8e3b
mentioned in commit 9864bed1
mentioned in commit 49183812