Stop using deprecated methods. Bug: 37863673 Test: make Change-Id: I4f7ad4f38c21e06235ab8f290ee83a6eebde5b5e (cherry picked from commit 4178c9ecbd0697540844e0d088e307408ec3cf10)