Merge "Add API stubs for module APIs"