Merge "Revert "Import translations. DO NOT MERGE"" into nyc-mr2-dev
am: a1b10fcdb9  -s ours

Change-Id: Ib21612d463f8918a3afea37932a517b555c6690c