Landscape Charm

Merge proposals dependent on lp://staging/~lihuiguo/landscape-charm/bug-1934816

  1. bug-1934816
  2. Dependent merge proposals

lp://staging/~lihuiguo/landscape-charm/bug-1934816 has no merge proposals.