Unity

Merge proposals dependent on lp://qastaging/~azzar1/unity/devices-cleanup-and-test

  1. devices-cleanup-and-test
  2. Dependent merge proposals

lp://qastaging/~azzar1/unity/devices-cleanup-and-test has no merge proposals.