Merge "Cleaned up usages of deprecated APIs"