Merge "Fix NPE in DropBoxManagerService.dump()" into lmp-mr1-dev