Merge "Delete dead code."
am: cf59ff79c5

Change-Id: Ifbb591a7bbed9c2a8f83fe321c3d12f08e096fe3