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

Change-Id: I9758322e7869a68af6865533fff36911a6de2b84