Merge "Add null check for session_info." into udc-qpr-dev