am ff3ead50: (-s ours) am e3b05d09: Merge "Tweaks for forward-compatibility"

* commit 'ff3ead5072721bfb24202ff9b041cc4291f34e21':
  Tweaks for forward-compatibility