Merge "Mainline API cleanup"