Update util to support pretty print

Change-Id: Id1a83372f9e936ce4f29202b063b825d63d2cafa
Merge "Update util to support pretty print" into dev/experimental