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

Change-Id: I7a3befdce21848f15a504b8fb18d52eef7ae051f