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

Change-Id: I21614803991c575f7de67157fd33d93002768011