Revert to orginal otter dependencies that my last commit changed.

Change-Id: I5f6d5fc0820b9879ee5e3dfdfb8143216e8681a9