Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 125deebf5d  -s ours

Change-Id: Ic90df3a0db800052813e23370e1b80846caae456