Match other devices and added more schedulers

Change-Id: I47fc53d1612dfc59fdc43f979f7dc83bdb3637e0