Merge "Remove various bits of dead code and unused workarounds." am: 97cf1fdd18

Change-Id: I2af7c12a361d3f4c6151599e612fc238118b60c8