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

Change-Id: Ia0ae00e094a88603c74725e0a1edcd0231a6bd43