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

Change-Id: Icb708a5ea7c3b41cb9d23885018b088c65ee427b