Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 175e8784dd  -s ours

Change-Id: I1f6b479c867e59de2b7ace9faf719d6aa36dbdb6