Merge "move support test package to sdk 26"