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

Change-Id: I799baf0efb73b38e7072c1dea3ba4c57dbb185eb