Merge "Import translations. DO NOT MERGE" into oc-dev am: b39c08f9d7  -s ours
am: 3cd12a1ca7  -s ours

Change-Id: Ibf672901baeae0668e40f04c37b2ab56801b5864