Rebase off of Slim's Settings BT

Change-Id: I5224d6716d2b75c991f4c5eb46bdb72a5becc29c