Merge "Import translations. DO NOT MERGE" into oc-dev am: 73e510e6fa  -s ours
am: 1ef794a3f6  -s ours

Change-Id: I88728103bc3cb22c7df3ae2056b55f7329ca150a