Add handy tool

Change-Id: I7d2076e8ec1f17f5390c2835f82f51a4abefcb79