am: ba0cdcdd -s ours Change-Id: I9ce8f6d478e7c99fa8c8b284d5d3d811651a4736
mentioned in commit 90bae4dd