am: 59857fcd -s ours Change-Id: I07c437d241bab98d3fcc3df3247b20f2ec18cdfe
mentioned in commit 20eace76