Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 71c4e0b44a -s ours
* commit '71c4e0b44acbf60c396de4984ddc498163c708e1':
Import translations. DO NOT MERGE
Change-Id: Ic16aa366bbacc24faa14223f5840b2847ff5e1dd
This commit is contained in: