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

Change-Id: Ia37c90a128225718bc64f103382a0c7c7f35b635