Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 45c9ba9c15  -s ours

Change-Id: I55a93590829178eaabf1899be1a740c763676c24