Merge "Hide required underlying caps APIs"