Merge "Remove cruft." am: 31105c8dd8
am: f4c4286904

Change-Id: Ide91c0e4e37ab8d4babc6e12d5c1d255d6e3c6b9