Merge "Import translations. DO NOT MERGE" into oc-dev am: 7c2a12b658  -s ours
am: 5a3998fe38  -s ours

Change-Id: Ic55a5b3c7cc13af454abc3fbb4f1dba7be64d107