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

* commit '7595e84d3a60d2a63990703043a8e9647f71e3a4':
  Tweak for forward-compatibility