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