am: 8845f321 Change-Id: I655d3a92182496448ef1a119859b213dfa940eec
mentioned in commit 5acc1d87
mentioned in commit 15bbdce4