Merge "Make util method public" into pi-dev
am: 64e497672d

Change-Id: Iad466f4f1cd0b588e1afeb50411162940ffeee25