Merge "Fix method not found for NotProvisionedException hidden api" into main