Clean up after obsolete methods update fix.
am: eab0248f87

Change-Id: Iaa79e5f13ce0697b843cdaf6c46a1f865dac63c5