am: bf07c41a Change-Id: Iddf2cbebb8d27023db9983527d11e9e327229c0b
mentioned in commit 09632671
mentioned in commit c31ecc7e