Merge "Remove dead code." am: a78c686799 am: 4cc92cc03f
am: 99cbff8058

Change-Id: I34c5f9c553b108a32705883e682c13931cdbf033