[automerger skipped] Merge "Cleaned up dead code" am: d14ed44c am: bcea9421
am: 084b7f51 -s ours
am skip reason: change_id I54849bafbd0d05206e67636f0717b4b833a5e229 with SHA1 5de4a2d8 is in history
Change-Id: I62597bee4d8f782347a00ed914b04071193e0ae1