Apply clang-format am: 830a1a6a92
am: cefdb5b740

Change-Id: I07385f545c1d15c6d6f077449766ce1bfc31581f