Maybe this bool clean-up avoids false -Werror=maybe-uninitialized on Android

Change-Id: Iab12cc703d190e79650f73c646a2fbb60c6685c5