Fix search for implicit null check. am: ee1f126431
am: 29a3db33a1

Change-Id: I1e9a830e9598f50244e955f75234cd51874e3966