DC: include otto by squareup

also some cleanups, as always

Change-Id: Ie273fb86bb9ea8ea0bcea5a653b7a6a0f03f7476