Fix interface assignments

Change-Id: I81213ce90d70f7fe67e8a8db3057a4b72ad55558