Merge proposals dependent on lp://qastaging/~azzar1/unity/fix-919567

lp://qastaging/~azzar1/unity/fix-919567 has no merge proposals.