Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 54c62db71b  -s ours
am: 3b16104048  -s ours

Change-Id: I664ce258c449ded2c4cb2f399c08f4a746ea4d00