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

Change-Id: I87e77b18f173d20154743daf5e735bf72bfc685f