Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 57e29b4b9e  -s ours
am: 902770c469  -s ours

Change-Id: Ie8aa40878420d1675a91da84f46cfd623044fb0b