Merge "Check the return values after updating Recoverable KeyStore Database." into pi-dev