Merge "Allow products to define their own hidden api stubs"