Additional patches for Qualcomm merge

Change-Id: I2ec6263479e138df7522023d0b5e4a17181461b0