Use util version of list_to_dict

Change-Id: I13f824878a9f3cc606934b55f85493cd99f24919
Merge "Use util version of list_to_dict"