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

Change-Id: Ic20ae6533f3c84702779046b4d0edfa6da17c228