am 9f1ef6d5: am 7595e84d: (-s ours) am f458d5fd: Merge "Tweak for forward-compatibility"

* commit '9f1ef6d57bbf1ac524eff849c8976acb012b5687':
  Tweak for forward-compatibility