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

* commit 'b92aee4e8c3d93235c9a57afa81711383538f54f':
  Add stubs for improved compatibility