Merge "Add sanity checking of API version" into nyc-dev am: ff697ef