Add stubs for improved compatibility

Change-Id: I77b348b4c592e0b694aabb069812c94b9cb79a00
6 files changed