Merge proposals dependent on lp://qastaging/~mhr3/unity-lens-files/fix-837810

lp://qastaging/~mhr3/unity-lens-files/fix-837810 has no merge proposals.