JF Control -> Device Control

Change-Id: I546beb51f594647614ef7ab40d88649690a71826