Merge "Add KeyChain to core product defintion since Browser depends on it"