Merge \\"Make the app name \\"Files\\" instead of Documents.\\" into nyc-mr1-dev am: 6aa504077d
am: f26d22ddc7

Change-Id: Ic8ba41cfcb588c1c52b4702c69dd054d9f5f4675