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

Change-Id: I76c205aea0f8314361bcbe02d9b52a6af686b16b