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

Change-Id: I7d6248afd47be986586f45a98b23a932d8457c2b