Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 44726df826  -s ours
am: f7fe3fd8f6  -s ours

Change-Id: I140686ea0321b286bc7fc2b8282a84af12f585a1