Device settings DERP

Change-Id: Ie7524000e964ec1ebc68aba828661120176bc90b