Merge "Import translations. DO NOT MERGE am: 1ca93650e9  -s ours am: b6227f2153  -s ours" into nyc-mr1-dev-plus-aosp
am: 8a3e7b4243  -s ours

Change-Id: I1b70f30ff79852a05cce0dccf257a7495ad8603b