Improve pencil-util handling.

Change-Id: I14b278546a90d123108f0383e9ab348ee1f1ae06