am 9fb00cb4: am 17fe99ac: Merge "Fix NPE in DropBoxManagerService.dump()" into lmp-mr1-dev automerge: bec816a

* commit '9fb00cb428f3d4b0241490146f4d5a7b75fc552e':
  Fix NPE in DropBoxManagerService.dump()