Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 728c6104 -s ours am: b059f0bc -s ours" into oc-dr1-dev-plus-aosp