Merge "Add storage for platform key IDs to SQLite db"