Merge proposals dependent on lp://qastaging/~chasedouglas/oif/empcommand-packaging

lp://qastaging/~chasedouglas/oif/empcommand-packaging has no merge proposals.