am: ad0e5a35 Change-Id: If467b24f30d97b439c7f5e6e1fb695e53f8560c3
mentioned in commit 4d608076
mentioned in commit 8a3e0d4c