Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 6564d7d123  -s ours am: dfd75c536f  -s ours" into oc-mr1-dev-plus-aosp
am: f9a0de0fa3  -s ours

Change-Id: Ic5cd6d5dde1610e7b17750b914826944a48c5f6f