Merge proposals dependent on lp:~ci-train-staging-area/gmenuharness/trunk-copy-please-ignore

1. trunk-copy-please-ignore
2. Dependent merge proposals