Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa97eb008e  -s ours
am: 83a6b9dc61  -s ours

Change-Id: I8110c325b71990a956c485d1074c073137c3611e