CM qcom guts

Change-Id: Id21d4e4e879598b653c6e2d4206da9549593eaf8