Merge "Mark modules frozen explicitly."