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

Change-Id: I878be7b33afcad9544515e90da4db02fe85b92cc