Merge "DropBoxManagerService: Don't store redundant information" into oc-mr1-dev
am: 75590ffa84

Change-Id: Id0037c455e0e37f7896d06aeedda9b7cdca35f63