Merge "Fix reboot loop due to NPE."