Merge "Allow RIDL to drop caps"