Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: 2d95320d7b  -s ours

Change-Id: I6be76b29b09522a7a951fbb868ac3486387b7c7d