Merge "Import translations. DO NOT MERGE am: b081f1e809 -s ours am: 43b03fbacf -s ours am: 7e3f20e249 -s ours am: b597ff837c -s ours am: 9336d62dcf -s ours" into oc-mr1-dev-plus-aosp
am: 28aeb5185f -s ours
Change-Id: I35663e31a17361df371c34f04665085d6d20ac27
This commit is contained in: