Follow proprietary vendor changes

Change-Id: I50c80d42d3cbc4b2c794d956edb4be2c6500359c