Merge "Remove dead code." am: 25c5e19a3f

Change-Id: Ie708d5e2a9b4d5c33ddd3ea2b7e0bba249ad3cbe