Merge proposals dependent on lp://qastaging/~rtandy/unity-lens-files/bug1425714

lp://qastaging/~rtandy/unity-lens-files/bug1425714 has no merge proposals.