WaE implicit conversion of NULL constant to 'bool' [-Wnull-conversion]

Change-Id: I8f208d6c87275aa4a169c7c6ed219200617c5669
WaE: [-Wsometimes-uninitialized]

Change-Id: Ie51a67474631ecfb0b223bd2f5a63ae8bf363e42