improve printer discovery
am: e604a9fafd

Change-Id: I05cac2710636f1cc61349885920ae642d0759601