Merge "Replace deprecated APIs with newer one"