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

Change-Id: Iae044e0aa00c834d4ba2a326eab390ff820bd907