am: 2334ee74 Change-Id: I46f32bd07059d1232cb277cac218f64df5d05bd9
mentioned in commit 120de320
mentioned in commit 0a2cac5e