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

Change-Id: I036507ba5241fcd0e5ce6f7bb3599cb0720b0cfb