Merge "Enhance java doc to explain what will be in bundle" into sc-dev