Merge "Clang-format before updating storage proxy"