Merge "Run update-api to catch up missing api changes."