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

Change-Id: I946b58688421f0836a454542bc74882679a93b54