am: ed95b7e2 Change-Id: Ie19c34625e8c0e350ac411377962382c342a7912
mentioned in commit b07981ba
mentioned in commit fe0b3ac6