Merge "Remove some code we haven't needed for ages." am: eaf0425ee7 am: 2c4822998a
am: 8cd462de2c

Change-Id: I0e9cccb748a5279b1ae41dfaf4c990a5b95ffa13