Merge "make CallerInfo a systemAPI"