Merge "Add OWNERS files for the recoverable keystore folders"