Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa97eb008e  -s ours
am: 86ce04b6e0  -s ours

Change-Id: I5fc1263b33bd46044de5d9c3576d190983b5e20a