Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 2c0df72ff6  -s ours
am: e566e3ec43  -s ours

Change-Id: I209ec6b46cf1d1e9133b05096e1b73cf38efef8e