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

Change-Id: Iefe85e1f132f9b399994f2be33fe741b5ef14b49