Merge "Swap for more framework APIs"