Merge "Improve consistency of stubs for framework targets"