Merge "Remove dead cruft." am: e9ba970f2d
am: 9cfa0a80e1

Change-Id: I4be837e13ec9d18f9244ac947d75e162b9b5286a