am: 6b0afa1c Change-Id: Ib69faa0162f07e05ef15f46363c0c0883b42649d
mentioned in commit 491154aa
mentioned in commit 4fdc4a74