Merge "Use "OS_INSECURE" variable as the insecure mode indicator"