Merge "Fix "Invalid columns in request:" errors, when there are multiple columns" am: fcab45ef2a

Change-Id: I1401cd6a04a62f1c7e34a9d9887d9330bdc28c05