UC: bring in Otto by square

Change-Id: Ic4d1ee13ccf50482b3c8f5e4f3b391ad9edfd405