Merge "Import translations. DO NOT MERGE" into nyc-dev am: 5a45cf7  -s ours
am: 892ba38  -s ours

* commit '892ba3827852ba888082c5d48afe73e847b46ab2':

Change-Id: I880b28234feb945e9571439807c992894bdc2334