Merge "Import translations. DO NOT MERGE" into nyc-dev am: ef2989920d -s ours am: 5346695e1d -s ours
am: 4a786994bc -s ours
* commit '4a786994bc87957a2b25baae9e8c1c5d89d87273':
Change-Id: I6c84f1fde6f701851d1805399102280243e959fb
This commit is contained in: