Merge "Remove uses of $USER"
am: 8060a07dd9

Change-Id: I7a248247db6420c4d497691af3a6b0a90208b53e