[automerger skipped] Merge "Add api files" am: 8b87238181 am: 858a8fcad7
am: 68c3dbda38  -s ours

Change-Id: I88c972a6aa83daf8f8e57a61eedd04257ef08966