Follow proprietary vendor changes

Change-Id: I60d1bdb2af54aed28199e58bc6da853c62cb4783