Merge "move survey and system test package to sdk 26"