Merge "Import translations. DO NOT MERGE" into oc-dev am: a0376f250f  -s ours
am: fb1469df92  -s ours

Change-Id: Ifb022132551c672231f4077e68d41b65ac6a2c2f