Merge "Fix issue with saving protos to disk during shutdown." into rvc-qpr-dev