Merge proposals dependent on lp://qastaging/~morphis/media-hub/fix-hybris-dep

lp://qastaging/~morphis/media-hub/fix-hybris-dep has no merge proposals.