Merge "Add API files" am: 1e7276d039
am: c8bf05730c

Change-Id: I680be5e6511b9d30e3ed0439f60f693bb9e06650