Clean up after obsolete methods update fix. am: eab0248f87
am: 42ffa5e9d2

Change-Id: I14bbaa485cf2a23c61f68773a2c8b494e2f15876