Halo: Fix possible NPE

Change-Id: If1f604baeb9c25c2b8009f2d98e18ecea8bdb278
Merge "Halo: Fix possible NPE" into pac-4.4