am: a7b80e12 Change-Id: I0458ec0a60944cb3e41bf2b548a04cc9c102a011
mentioned in commit 2e27ddcf
mentioned in commit 479d67cd