Merge "Add null check for the parameter CallerInfo in onCallerInfoQueryComplete"