Merge "Import translations. DO NOT MERGE" into nyc-dev am: f79616b427  -s ours am: 88fdea080f  -s ours
am: d4983475ad  -s ours

* commit 'd4983475ad4154894a280c703a3a9eb3a530db3e':

Change-Id: I828546537e996ead723b4f7c991255f5387ca026