Apply clang-format am: c645471cce
am: 1c6140b3b6

Change-Id: I4cc916657c1e6f648d277b4070576f698baef66b