Merge "Fix the build (mucked up an API change / commit / upload sequence)"