Merge "Import translations. DO NOT MERGE" into nyc-dev am: 47a7899  -s ours
am: a42bca8  -s ours

* commit 'a42bca855509b3360cdf42a1f5677682d1d074b6':

Change-Id: I80a1b3a9693ce901bd3c0cf1149a562b8addeedb