[OS-BUILD PATCHv2 0/2] Turn off forced debug builds