Merge "Import translations. DO NOT MERGE" into oc-dev am: 9b0fbfbf9f  -s ours
am: 87f894f16f  -s ours

Change-Id: I32f0ee365e3d82ac9eb57783ee51705e0b3fb8ee