Merge "Use sysprop flags on host"