Handle onNullBinding

Test: atest
Fixes: 111388269
Change-Id: I3e25a11712ee913ddc4b0ef5dd6055aa804ba94a
2 files changed