Merge "Cleaned up dead code" am: d5a744abb6 am: c5aa9448a7
am: cbdc0f57f9

Change-Id: I53f9fd3bbec32bd08a89bdcc8751c8cca1ac39a3