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

* commit '5f421caf157bf54c2cfd2ded128ede466e761d4d':
  Forward-compatibility stubs