Merge "Remove dead code." am: cdd0aaa3ae
am: 186d539b36

Change-Id: I1e5218d0b1e5a78b25d851da3b76b5cadef29df1