Merge "Remove references to hidden APIs from public Javadoc" into sc-dev