Merge "Restrict scanning port range, not emulator count" am: 8a2390a1ee am: 54a85ce753
am: 4b868d648b

Change-Id: I79ce65ada9dd071b1eba7743d5e3d5212ce68fef