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

Change-Id: If3096bf1b094c844ce00992ce9e464b01e8eb47b