Merge "Import translations. DO NOT MERGE am: b081f1e8 -s ours am:...

Merge "Import translations. DO NOT MERGE am: b081f1e8  -s ours am: 43b03fba  -s ours am: 7e3f20e2  -s ours am: b597ff83  -s ours am: 9336d62d  -s ours" into oc-mr1-dev-plus-aosp
am: 28aeb518  -s ours

Change-Id: I35663e31a17361df371c34f04665085d6d20ac27