Merge "Add API stubs for module APIs"
am: f828b6c71d

Change-Id: Icb10b4530809401402cf4b19ad1f9ea1cd07f6ce