Merge "Removed Calls to deprecated APIs"