Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 4f6d64ea0d  -s ours
am: 331cc39563  -s ours

Change-Id: I83c55695fe2ec35fdc6fca753a8c62b90d90a36e