Merge "Add assertion messages" into sc-mainline-prod