Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 979367bc -s ours am: ec80d611 -s ours" into sc-dev-plus-aosp