Merge "Import translations. DO NOT MERGE" into oc-dev am: c5179f67a1  -s ours
am: 7196c23b2b  -s ours

Change-Id: I413ee6742fcd757b0533747b9670128bb0117c13