am 1cd83102: am b92aee4e: am 69e9c30c: Merge "Add stubs for improved compatibility"

* commit '1cd83102d4950327a6bd76f27b5d320d77e4bf84':
  Add stubs for improved compatibility