Merge \"Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: e573989e05  -s ours am: 5b96cafec8  -s ours\" into nyc-mr1-dev-plus-aosp
am: 998419750c  -s ours

Change-Id: I03d543d1362b5e461836aa2e9de84d7540f4d420