Merge "Enable vendor error/acquire messages on user build" into sc-dev