Merge "Add Network Scan helper class" am: dd21596dbb
am: 726c3b0fa3

Change-Id: I03b1f2f48afcdce780158cb217acfaf30d887268