am: 7bf6a0cf Change-Id: I4f36db296c4e15a9e5b6d77cd62f85442cd492c1
mentioned in commit 0e757fae
mentioned in commit c2866424