Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 60ab8d072a  -s ours
am: d165fa2027  -s ours

Change-Id: Icc61d51603a9806af0849a9aec01a4e58becffb1