Merge changes I7efa6439,I3460cf06

* changes:
  Apply Clang-format from stable version
  Fix comments before applying clang