Merge change 715 into donut

* changes:
  ADT #1820114: Provide a quick UI to edit AVD.