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

Change-Id: Ia5d714ce352ec4dca606dc43bbc12e73f2ad3589