Merge "Dropbox: remove redundant Entry construction." into gingerbread