Merge "enabling drop-test on cpqd"