Add basic support for conditional execution

Change-Id: Id7bbdc2518efbbefe2a2e3be4d3a685ac930b2ac
Merge "Add basic support for conditional execution"