Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: a445650c90  -s ours" into nyc-mr1-dev-plus-aosp
am: 11ca67fbae  -s ours

Change-Id: If4830ee238ed83276c9b3843b373e01bb0ece7b8