Merge proposals dependent on lp://qastaging/~corey.bryant/trove/fix-for-1347567

lp://qastaging/~corey.bryant/trove/fix-for-1347567 has no merge proposals.