Merge "Fix NPE in BootReceiver.addTombstoneToDropBox." into sc-qpr1-dev