Merge "Stop reading fs-verity certificate from keystore"