Merge "DO NOT MERGE Fix DropBoxManager.Entry parcels with fds." into mnc-dev