Merge "Add more comments for resolv apex."