revert amazon scheduling changes

Change-Id: I285188a39bbb87d0216696fca8a8781792601351
revert amazon cache maintenance

Change-Id: I972953e093d26612a01773b7f96ba34609b57e28