Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: a980312abf  -s ours am: 9f05e68ea5  -s ours am: cafd489390  -s ours" into oc-mr1-dev-plus-aosp
am: 1e7d845552  -s ours

Change-Id: I3a64a9526a983c0c616a760abd00ec1a0f5d7b61