Add GooManager support

Change-Id: Ie40fd0e60ac1e8a004d728fd58440769bed64449