Merge proposals dependent on lp://qastaging/~rodrigo-moya/unity/fix-732049

lp://qastaging/~rodrigo-moya/unity/fix-732049 has no merge proposals.