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

Change-Id: Icf6a888fcd196b53b350c1a4380daf404fc7c373