Merge "Fixed serialization issues with Augments and java types"