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

Change-Id: Ia7869d0fcde0a98cb706ac10836bad8d02f54272