Merge "DO NOT MERGE Change Wifi check to warning" into marshmallow-cts-dev