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

Change-Id: If561d2d9a2ed14e97f7c5570b53ff744fafa7981