am: 79b7018b Change-Id: Idaaebb5a285bc26163978376a6439928ccaf0383
mentioned in commit 1346e19b
mentioned in commit 3e51906f