Merge "patchoat: Move nullptr CHECK"
am: 6e49cd6ec9

Change-Id: I3caa95d16039fd66c55a07becdd5bac251045bd2