am: 2aba384d -s ours Change-Id: Ieb1f97f20e4f465fdc0a31743feb7e4593c8dd2b
mentioned in commit 8def5f1a