remove cloud control from settings provider

Change-Id: I53ab072274b960a56694e847e630e5efbdd9cff3