Merge "Always enabled the Advanced Option under Mobile Network Settings" into oc-mr1-dev