Merge "Import translations. DO NOT MERGE" into oc-dev am: add95c01b9  -s ours
am: 4d3b0f119f  -s ours

Change-Id: Ib7dcfe1de90c6c25fd1bd59cf1261714152d64c6