Merge "Remove dead code."
am: 8b6f35abf2

Change-Id: Ib748fef3e54687c2da1818a7cd738f31e30b79ac