Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 60c9a61b93  -s ours
am: 7dbdcdd289  -s ours

Change-Id: Ie1acfeb7347e8fadb8dd4a1774f53744e1719f93