Merge "Remove dead code." am: a78c686799
am: 4cc92cc03f

Change-Id: I48b1f09846cd7597dabbe5c1c0a8e5bff10ed20d