Merge "Clean up internal usage of now-deprecated Compat APIs"