Merge "Remove dead code"
am: ce180df603

Change-Id: I34bca1f2ff0e2221c0df447e5b8914deac49e03f