Merge "Stop loading fs-verity certificate from keystore" into rvc-dev