Merge "move tests to sdk 26"