Merge "Remove dead code." am: cdd0aaa3ae am: 186d539b36
am: 269b78b989

Change-Id: I859380658209ecd9de720bbc747bd047958e8922