Re: [OS-BUILD PATCH] Revert "Merge branch 'ec_fips' into 'os-build'"