Fix union all by selecting the same fields
Bug: T292871 Change-Id: Id68aa85511a114a993cbc039daec3470ed98ee90