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

Change-Id: I99757e8935f2091e2c1d3575d27bafa0b7961e58