Reorder constructor arguments for easier code generation
Reorder constructor arguments for easier code generation

Change-Id: Iaaf3bf673851cc971251d8c198313c10139a8d11

flabbergast-config/flabbergast,flabbergast-config/flabbergast,apmasell/flabbergast,apmasell/flabbergast,apmasell/flabbergast,apmasell/flabbergast,flabbergast-config/flabbergast,flabbergast-config/flabbergast,apmasell/flabbergast,flabbergast-config/flabbergast,apmasell/flabbergast