Patch cleanup

Change-Id: I73c02c035d6843998cf779a43ba8bc291142dbd3
Patch cleanup
Remove unused deferred_probe

Change-Id: I6ec1b56e1f31e516020a70d5e61255f2bb8e0b93
Patch cleanup

Change-Id: I97d6d02ec2ebacdcceca778008a13d993d003a87
Patch cleanup
Remove timeout code and sync with base

Change-Id: I3dba9014c6c2a98b80e217f9f0325ec22718c4a5