Merge "Fixing SetBootParams unittests"