Merge "Fix typo in RootOfTrust database creation."