am: e6504512 Change-Id: I2c96f98191a030a3056d51931366bc4960c1355c
mentioned in commit a28c4f9d
mentioned in commit 20f1b1ea