Merge "Remove dead code." am: 3bde05d928 am: 8e5fb5a0e7 am: a5a65785ab
am: cb132c07a5

Change-Id: Icf62e17bc762657a7277b198cb28f4a49ce3461c