squash several upstream changes from CM for our qcom devices

thanks

Change-Id: Iab25808768a8f017c9d6604f153988156e83f02c