Merge "Update comments for doc comments." into pi-dev