Updated tools

Change-Id: I5206efbec3cbcdea4f7117681fed17b481cc07b3