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

Change-Id: Ife71c182778ed061acae6ec5efd440309cd8a553