Schedling and device mgmt changes

Change-Id: I2ba0aca55d4fc5c5b6b74b34720db1a209c89510