Merge "Pass flags to allow domain undefine with NVRAM"