Simplify variable typing for IA builds

Change-Id: I065e5176b3a15bd74ba832f8827b4a4e4837b0f7
1 file changed