Merge "Make boolean-2-integral-conv less dexer sensitive."
am: 437bb1e438

Change-Id: I84e1ff37af8d52726adb3e2cfb1b259b3e16e355