Merge "Format CMakeLists.txt"