Merge "Bug 1223: Cleaned up BindingTestContext from unsupported components."