am 69e9c30c: Merge "Add stubs for improved compatibility"

* commit '69e9c30c2641add74c9a3b02d0959c0ded9e66f7':
  Add stubs for improved compatibility