Merge "fix(lib/psa): fix Null pointer dereference error" into integration