Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 576a32da20 -s ours
* commit '576a32da207ec435aa466985c827bc56709db5eb':
Import translations. DO NOT MERGE
Change-Id: Ia3f0a81f0595a1d7f3f24ef1576bd20842da6420
This commit is contained in: