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

Change-Id: I1db24fe05ada8b3a37a9a60aa568b6153bf51ad8