Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: e8dc857c2f  -s ours
am: 28b2f5f023  -s ours

Change-Id: Ib39b4454eeef0444f829e84a6967220e67f93f46