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

Change-Id: I86dedab8acee43f6c13d7b8940ba3cbfd801dc35