[automerger skipped] Revert "DO NOT MERGE CTS: Test column name with spaces" am: 1f4a58b6 -s ours am: 9db5477d am: 0ec8655d Change-Id: I9dca5ea92b51be3517a954f09f910b574d5d3d79