Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 43a4e5f4ea
-s ours
* commit '43a4e5f4eaae8a3c886a7f9e66707f8253fecfdb':
Import translations. DO NOT MERGE
Change-Id: I7ba01b3156de2044a05491d88a98681449edf94c
This commit is contained in: