Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 93bc210b3f -s ours
* commit '93bc210b3f9e9a86074080324162b3a66cac104c':
Import translations. DO NOT MERGE
Change-Id: If8c66d039bb6cb91fad5011c0f63ca309a80af15
This commit is contained in: