Revert "remove DeviceControl for now"

This reverts commit ecd0bd61ec754d5cc7fb8e802aafa226af2c34cd.

Change-Id: I47436509d9daba77ce4e96c0aac7d675510c95c5