Merge "Enable 5 bar signal strength for VZW" into oc-dr1-dev