de-macroize ucb sortresult

Change-Id: Ib522fde5e453560b23c0189a29b50f5dfddb4482