Unity

Merge proposals dependent on lp://qastaging/~sil2100/unity/autopilot_shopping_fix

  1. autopilot_shopping_fix
  2. Dependent merge proposals

lp://qastaging/~sil2100/unity/autopilot_shopping_fix has no merge proposals.