am: 5af33917 Change-Id: I8899c00c9db94d0908d2206257c266de86857f5f
mentioned in commit 89a4c6e0
mentioned in commit 2478d75d