Merge "Import translations. DO NOT MERGE" into oc-dev am: f0bdfbc508  -s ours am: dee1ecf9df  -s ours
am: 74facaef64  -s ours

Change-Id: I3462727e4af8ea67b64316422a02cffed77106de