Merge "clang-format: ContinuationIndentWidth: 8"