Merge "ApiFile and a few more methods are now public" am: f206f14d7c am: 479ad6b0ac
am: 1002031baf  -s ours

Change-Id: I657a6e31d1fc0bee879c21e1e25d77a8ee75f7f4