Merge "Import translations. DO NOT MERGE" into nyc-dev am: cace07e727 -s ours
am: 479f70c516 -s ours
* commit '479f70c5167806d916bceb7f241227f90ccd3242':
Import translations. DO NOT MERGE
Change-Id: I122d411f09df424963f85f9c75b2f2abec92456e
This commit is contained in: