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

Change-Id: Ia35c684ae43442ad389ffde0ad0276c8d69f3bea