Merge "Update usage of HidlUtils functions"