Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev
am: 46aaf3e039  -s ours

Change-Id: I1b03ec696e9588055c19fee8eb524c82f307c102