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

Change-Id: I060e73ebf28424676c37b46a489766d94b79800e