Remove the old way of post-CHO and enable time trigger on new post-CHO

Change-Id: I93796ecbaa0e3def513461cb50c389926cfc644d
2 files changed