Merge "Partially revert "Add blocking and retrying wrappers for INetd uses."" am: 8b560611bf
am: a084e3283f

Change-Id: Iefdd5394fbe33fe4ce9706ec587a76c8da4f5dd3