Merge change 839 into donut

* changes:
  ADT #1823896: AVD Manager button in the AVD Selector.