Merge "Import translations. DO NOT MERGE" into oc-dev am: 8d95e04111  -s ours
am: 0984cb48d5  -s ours

Change-Id: I689917a893721e173996875393e1b8d68d827e54