Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 11a81ce6a1  -s ours
am: e7cb09f199  -s ours

Change-Id: I05bd08af5632d28e66ac06f47d2bae71d0787c77