Merge "init; remove dead cruft."
am: dfc4ad2a9c

Change-Id: I2d5692af6ba9104b0801186aaa7ca067fe4993c0