Merge "Import translations. DO NOT MERGE" into nyc-dev am: 33793c58fa  -s ours am: b8d309d8c4  -s ours
am: d689c15622  -s ours

* commit 'd689c156226fceeada60986ab3fd291853cc7e1c':

Change-Id: I9d3f0e2fe0df0248be5b5e511867c3f5b70cb497