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

Change-Id: I007993430ab0258ab6ade39a7c2f8e5705f526f8