This reverts commit 68d7ebb8. Reason for revert: adbd issues have been fixed Change-Id: I98d34b5daee8ed325650ba6f9cb3f35b250ed5af