Merge "Re-indent clatd code with clang-format" am: 5d1b880412
am: 0d9c26ade7

Change-Id: Ic9febe5265660fc1734ccb5a12724e9e5ba32665