am: ec99d67c Change-Id: I2c99519b7601c66b52407ac2e67bf8d57856ed78
mentioned in commit 6eef652b
mentioned in commit f268c039