Merge "Utilize verbose KeyChain errors" into pi-dev