DO NOT MERGE Don't use deprecated APIs

Bug:
Change-Id: I29bb1382f673e0fad3f5af8b40c72d02752bdf3b
1 file changed