qcomm related fixes