Summary: Backport change to correct interface initialization.
Reviewed-by: gtriantafill, sspitsyn, dholmes

Reviewed-by: dcubed, coleenp