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

Change-Id: I4bf7445c7aa305954115b7ef2ab493113861d7aa