Merge "Expose Structs and constants in XfrmController"