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

Change-Id: I94cb35268a874b6ffa1f9c46f9587af7110b7250