Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 6d995219d9  -s ours" into oc-mr1-dev-plus-aosp
am: 2eb12cad3f  -s ours

Change-Id: Ie3f5a6993414aa123b1dbeb8be27beead2885d5a