Adapt proprietary vendor changes

Change-Id: I86730d43268e209aba3031c654b8ac6b380ad098