Merge "Fix an NPE found during CTS testing with setCallerInfo" into main