Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 814fb3b7a1  -s ours
am: 9840c89235  -s ours

Change-Id: If1f0055b82b51ae304b5bacafa95821d8eaa2d07