Merge "Update API for OneShotRemoteHandler" into main