DO NOT MERGE Remove dead code

 Cherry pick

Change-Id: I19603a6e234b0b2592ef90fd426b2973cff8e4fd
1 file changed