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

Change-Id: Id5f7695856db3b6f19dec85ed716a77775ceb346