am f456d32d: (-s ours) am d7007cd4: Merge "Forward compatibility patch."

* commit 'f456d32d3c3aea966b5fba43e6d34f72df06c60d':
  Forward compatibility patch.