Merge "move connecteddevice test package to sdk 26"