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

Change-Id: I0cde2e97d2d4ed8659b06ecae96c57a32f501e09