am 93df415c: Merge "Add stubs for better compatibility"

* commit '93df415c1e0b4c99f274adb3629ce19abf1d0f53':
  Add stubs for better compatibility