Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a103  -s ours am: 995029b529  -s ours am: e861cf8791  -s ours am: 9d5cc8b67f  -s ours" into oc-mr1-dev-plus-aosp
am: 9623c914f2  -s ours

Change-Id: I8fcac1c59d96d9eb0fbbb0056f79baaab658cc64