Merge "Fix issue #35813031: API Review: RemoteCallbackList"