Merge "Replace USER with BUILD_USERNAME"
am: 072e9fe5bf

Change-Id: Ieff7c94119f828c9e1e4f0e1d8cbcbc7225ccaff