Merge "Swap out owners for keystore frameworks bits" into main