Merge "Refactor to InterfaceParams utility class"
am: 6a91687bcd

Change-Id: Ia8ea85890c86cf57b0bc701c2624762144af301e