Add more uses of numeric constants
Add more uses of numeric constants

Change-Id: I9c27249d607fe4ec313567c2c102c236ae906445

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