squash several upstream changes from CM for our qcom devices

thanks

Change-Id: Ideb42e10ec620743992e379f4e95e3a9f04a6e0d