Remove dependence on unavailable QCOM props

Change-Id: I7b0b1df7795dd24efe17acf8478a1eae20e9c77b