Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: ad45d97c45  -s ours am: d557ea9388  -s ours
am: 0141333d25  -s ours

Change-Id: I12544624bd86847af3528ec3f932d1442fee8f59