WaE: implicit conversion from bool to 'short'

Change-Id: Ibb8bef1b7a0d00b6b757966c0b8210dd6e03db0c