merge updates from franco govs and enable ondemand, conservative

Change-Id: I657a0227c18a7512ba5e6ce291e7d47473e86d2e