Merge "Guard against null component when binding KeyChain" into nyc-dev