Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 61058919ca  -s ours
am: 29246c2795  -s ours

Change-Id: Ia19c295cc0f1273d5d68e4a7ee89d7cc0151a46f