[automerger skipped] Revert "DO NOT MERGE CTS: Test column name with spaces" am: 1f4a58b6 -s ours am: 28c65dc4 -s ours am: ffbb5415 -s ours am skip reason: subject contains skip directive Change-Id: I9e5738123b64eb27e7649ee4eb017ea78e514964