Merge "Import translations. DO NOT MERGE" into oc-dev am: a980312a -s ours am: 9f05e68e -s ours am: cafd4893 -s ours Change-Id: I78d02627ec2eabd9315d2aa4996e87fc0358c768