Merge "Fix NPE in BootReceiver.addTombstoneToDropBox."