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

Change-Id: I304273d884ee7eb497ed4386f2f5f7d94f29ae8c