Merge "Make util method public" into pi-dev