Merge "Import translations. DO NOT MERGE am: facc57619c  -s ours am: d045d85bdd  -s ours am: 67808fcdca  -s ours" into oc-dev-plus-aosp