Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: e82b728101  -s ours
am: c0ff60f272  -s ours

Change-Id: Idb46ad6bc668e3e86b964c0a9e74581116b56812