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

* commit '015a248e631dc10fd6b52ae8773c0a3e0cf752af':
  Add stubs for better compatibility