Merge "Enforce bcp/sscp stubs do not compile against apps" into main