am f6067133: am 5f421caf: (-s ours) am c2ad1992: Merge "Forward-compatibility stubs"

* commit 'f6067133f37c4b3f7ec653032b1432506be758fd':
  Forward-compatibility stubs