Merge "Remove dead cruft."
am: e9ba970f2d

Change-Id: I43041b9644da8de7dffd99c45eadb06d04c1a849