Updated to use the new external naginator package

Change-Id: Ifff980be4266922ae6cab7b7f62ef9fa6212fbaf