am f08e4afd: Merge change 4425 into donut

Merge commit 'f08e4afd45a793dfe74521c84f91c8ced1eb19f9'

* commit 'f08e4afd45a793dfe74521c84f91c8ced1eb19f9':
  First step of a more standalone AvdSelector.