am: b7e22162 Change-Id: I9966933b76bb87381322ee5c036f64d98e82d157
mentioned in commit ac958181
mentioned in commit 1afe9e06