add methods to enable and disable automatic device selection

Change-Id: I7136ad48ad3f20c60b77838225ce6c927514acff