Merge "Remove dead code."
am: a78c686799

Change-Id: I022c12aa207996129aadb918a0fdd797f2636904