Merge "123197896: The last-released API file is the wrong one" am: 2a9aff1db5 am: 03680cb307
am: 3ba77e2fd3

Change-Id: I506dca711d2ded3b238b6f4580f2e132dd0735db