Merge "Add Network Scan helper class"
am: dd21596dbb

Change-Id: I96e5670337ba0b516b8cf7ba705d3b221dce0988