Merge "Remove unused code."
am: c6f628cbfe

Change-Id: I1b631fdbffcab03075b28ad946f0e022e93d0cfa