[automerger skipped] Merge "Cleaned up dead code" am: 8ef74332 am: 20d7193b
am: 31e23a36 -s ours
am skip reason: change_id Ib9fac3d8cff28990c8eacdf86c7bc4adc0825f4c with SHA1 60dc09b8 is in history
Change-Id: I0752ba42e90d5aa4fa90df5003b414f37a27e347