Merge "Merge "Update logs to use ks_err in rust code" am: 6779299453" into main-16k