am: 94fdb253 -s ours Change-Id: I53115d6d42cf0382761e061561e2507ef6c84974
mentioned in commit c43903a3