Follow proprietary vendor changes

Change-Id: Id21708811ce876a3c6f72b8298b72b856d50fcfe