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

Change-Id: Iaca200f529c8d0bcd6eacd81604c4c5c470061f8