Merge "init; remove dead cruft." am: dfc4ad2a9c am: 8d69c92b6d
am: a391213d8a

Change-Id: I6270af0b17f36b683bf4d84e024e694e6c3c66ca