am d107453d: (-s ours) am 84dd87d9: am 015a248e: am 93df415c: Merge "Add stubs for better compatibility" * commit 'd107453d': Add stubs for better compatibility