Merge "Remove more dead code." am: 0c2dab9adf
am: 498163c28a

Change-Id: Ideaa81173100257b82671ac7cc17a3567b5eb3f3