Merge \"Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: c20ea2eb43  -s ours am: 26e9a5c9f8  -s ours\" into nyc-mr1-dev-plus-aosp
am: a6e9d05712  -s ours

Change-Id: If9a2e515ef9a06bce71928783d14f06fac0697ca