Merge "Import translations. DO NOT MERGE am: 126ce95bc6
-s ours am: 07a57fc90b
-s ours" into oc-dr1-dev-plus-aosp
am: a659760862
-s ours
Change-Id: I708b16b0e9daf87a9605107c7c4451eb67ebb189
This commit is contained in: