Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: a7f60741 -s ours am: 799144a1 -s ours" into oc-dr1-dev-plus-aosp