Merge "Update keystone default softparams"