Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: ac63c8589c  -s ours

Change-Id: I4cd96a7ce626d7106da0e370ad05f9ed4fdfcbbe