Merge "Fix an incorrect null check" am: 09071b4fa8
am: 2de74edd83

Change-Id: I519ee44d10bba260be6a13acb2bc59bdcb4a036c