Merge "Import translations. DO NOT MERGE am: 4fd35e0578  -s ours am: f46f825edd  -s ours" into nyc-mr1-dev-plus-aosp
am: 2ba460946c  -s ours

Change-Id: I09fca97d0bb4b6c6041dedc6ef4a3a47833592f4