Merge "[XFRM_MSG_GETSA] Fix the class names and code locations" into main