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

Change-Id: I35a3f583390c5a03682680921cc593e48fb77f88