am: 05ac69f4 Change-Id: I9acc956a2e5af465fc354ac0fbd4b9912b672b02
mentioned in commit cfbf3405
mentioned in commit 69508b08