Merge "Fix CTS breakage in Context and Override configurations"