am: 8344e753 -s ours Change-Id: I3a542d99ff4b98cbb1d3ea6533f64b8bcaa50339
mentioned in commit 34d05428