de-macroize ucb filinsreq

Change-Id: I880eff465f48882b17779e9e707b82d44ac27531
de-macroize ucb filprp

Change-Id: Id8c72bbc527a9dbe706761ed635d5ce621047e8e
de-macroize ucb filrow

Change-Id: I2dc553b5618a61079e6fa1c56c77268fdbfd158b
de-macroize ucb filrset

Change-Id: I48a7aa2eaa5c2694eae0e9139ba7d2f165a195d1
de-macroize ucb filstr

Change-Id: I08f7d8360a3abdac1b12bd3cfb157e408b0aabbe