AI 146778: am: CL 146776 fix NPE in AvdManager
  Original author: xav
  Merged from: //branches/cupcake/...

Automated import of CL 146778
1 file changed