Merge "Move encapsulation info fields to stable types"