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

Change-Id: I43d7f780c942eaca845903d578624b43fba70a44