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

* commit '49b73385146cb566e242c63abc3c3781750bec43':
  Tweaks for forward-compatibility