Merge "Update javadoc for org owned managed device case" into main