Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 040c26f636  -s ours am: 08674f3a25  -s ours" into oc-mr1-dev-plus-aosp
am: db925ec4cd  -s ours

Change-Id: I7f35b4130090c0f2f8d0c093268ca5af7fcf7d37