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

Change-Id: Ia1aa363704c67981a0c59c8df3b71f5693074751