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

Change-Id: Ib3bf970248fec4410e2a4de47825c511b34fff6e