Merge "Replace deprecated APIs"