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

Change-Id: I9924f850adbb2ab15606c72b9002b6ad36a5fb12