am adae1e91: am 1b8c33c6: Merge "Forward compatibility fixes"

* commit 'adae1e91de4b2be7a67a33e8f3c3161f5cec15e1':
  Forward compatibility fixes