Merge "Import translations. DO NOT MERGE am: b865bb1e4b  -s ours am: baaad57d62  -s ours" into nyc-mr1-dev-plus-aosp
am: 926ccfdede  -s ours

* commit '926ccfdede6c4d5ea3c43f1cccabb71b09b17c2f':

Change-Id: I0b14427abe5bc887fe98e8ca789a979b35cc82c9