Merge "Import translations. DO NOT MERGE" into oc-dev am: 69ca32dcea  -s ours am: 60af01bec9  -s ours
am: 728b23a934  -s ours

Change-Id: I2d7def5a1bce48ce826a43541e1255a8a4e1e44f