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

Change-Id: I6c08428750a6e5f94c4f8f2d459633ebda41bfd6