am: 506fc042 Change-Id: I2d9a5001bb7b437aaa3dfdb7268fca8be280b9e5
mentioned in commit bee631af
mentioned in commit 4be8bd8c