Merge "Additional failure tests for KeyChain" into mnc-dev