Merge "Replace USER with BUILD_USERNAME"