Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev am: 8bf32cc2bc  -s ours
am: 82f5b3581f  -s ours

Change-Id: I66865701d57b215ce53daf45e9e1e34095f40737