am: 48062133 Change-Id: I2c855e5ab849531d9dceadc0908871cfce326056
mentioned in commit 4f45c7b4
mentioned in commit 5c900932