Merge "Check additional constraints on requestNetworkScan" am: 9d3036297a am: 0c0ac2b126
am: e38a3b3791

Change-Id: I32209c25630a455e6baf0ad6adad74fd8b8ac184