Merge "Merge "Removed close guards for Element and Type objects" am: 97c9b57cec am: 25684ceff5 am: 04d8f0c843"