Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 48229d7781
-s ours
* commit '48229d77817bbf4c169787bef8faddd77bf890a1':
Import translations. DO NOT MERGE
Change-Id: I736dc40ed3a5ba94a145779a30ab8e21b1ee601a
This commit is contained in: