Merge "Use sim language for VZW." into oc-dev