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

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