tweaking conservative interactive and ondemand

Change-Id: I4996ea686363a1cf41be473e28eccd5cb4d91986