squash several upstream changes from CM for our qcom devices

thanks

Change-Id: I95a5aec11ce218b6059155224187f6c21f100489