Merge "Revert "DO NOT MERGE CTS: Test column name with spaces"" into oreo-cts-dev