Merge "Include compared values in assertion messages." into mainline-prod