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

* commit '84dd87d992d88d1f407796a41bc8baa27dc97a81':
  Add stubs for better compatibility