Merge "ApiFile and a few more methods are now public" am: f206f14d7c
am: 479ad6b0ac

Change-Id: Ic8d1dba73c4df83425b091901cdc673f71908bd4