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

Change-Id: I1b9b249c19eeed8c0a762400d344c4c806626d35