Merge "Replace USER with BUILD_USERNAME" am: 072e9fe5bf am: 73a99f447e
am: 0c6bd93500

Change-Id: Ic9b01d4f9e50537a31f91c87fdb4feabaa544365