Cleaned up usages of deprecated APIs

Change-Id: I754293e52aa7c313d894f27cfecd083ae63d6445
1 file changed