Merge proposals dependent on lp://qastaging/~ohnobinki/gloobus-preview/build-fixes

lp://qastaging/~ohnobinki/gloobus-preview/build-fixes has no merge proposals.