Merge "Enabled annotations for api-stubs, system-api-stubs, and test-api-stubs" into pi-dev