am: f86d7ad9 Change-Id: If615b6010d9419e64dffd4ece5bb7cf47ce40dbf
mentioned in commit 8eb1c41e
mentioned in commit 17419e37