am: 39c8ee88 Change-Id: I2fc21626aff6492ae2c3dc068ce9e30d776b6dc4
mentioned in commit 7e910646
mentioned in commit 88fad7ab