Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 4316b8a -s ours
* commit '4316b8a09d591b64f5cb944417573fef47fc453c':
Import translations. DO NOT MERGE
Change-Id: Idc0d1c71536b1145daa8cbdb540e72e067a3389c
This commit is contained in: