Merge commit '8ffde4bf375063f622a5227c349506cb6721f660' * commit '8ffde4bf375063f622a5227c349506cb6721f660': ADT #1820114: Provide a quick UI to edit AVD.
Merge commit '8ffde4bf375063f622a5227c349506cb6721f660' * commit '8ffde4bf375063f622a5227c349506cb6721f660': ADT #1820114: Provide a quick UI to edit AVD.