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

Change-Id: Ife54f4e800fd4b81c5639984937096945f063d1d