Merge "[automerger skipped] Merge "[DO NOT MERGE] Make sure WiFi and Cell tiles are not created in Provider Model" into sc-dev am: fd48e9f7e5 am: 462291a559 -s ours" into sc-v2-dev