Merge "Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:...

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

Change-Id: I7b9790b18b43b1983dcf0883d86a0a32d27de51d