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

Change-Id: I0784e65adb0e8ffd8b90aab691140e02db73222b