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

Change-Id: I09f9b62e9d6de92f7114638d4a8fdd82024214da