Remove dependence on unavailable QCOM props

Change-Id: I1f9505fb765f4f612a6a15a00ac414c938114dd4