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