Merge "Include pre-generated copy of api-versions DO NOT MERGE" am: d535b7207a  -s ours am: 0933a23fbf  -s ours
am: 586dac76ec

Change-Id: I5f6ca95469044429baf98e416c9504f350cd9ab4