Merge "Don't leak captive portal broadcast receivers." am: 873badbd1c am: c097e76769
am: 3a1c0ad3ee

Change-Id: Ic07daad92569f67e660daec8f6828f4c97b9b9f0