Merge "Restrict scanning port range, not emulator count"
am: e6413fcd94

Change-Id: I35fc9710f1025c300fc56d989e9735aa10e2bb20