Merge "Update the Javadoc for the edge-to-edge enforcement" into main