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

Change-Id: I35ebad1911c8d548f3918026be446075a471d1c8