Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9724569903  -s ours am: 18b818e2dd  -s ours
am: 415ca774d7  -s ours

Change-Id: Id74d022ccc416b1c3f528f9c2a210376f05582b8