Merge "Remove restriction on bands for NW scan" am: 892a6953d0
am: 5a2189500b

Change-Id: Ia9111113142d9b0c2e2beb6d5d54822504f35c95