Test: No code changes, just ran through clang-format Change-Id: Id23aa4ec7eebc0446fe3a30260f33e7fd455bb8c
Change-Id: I1dec4cd234e5ee8bb01140b969d0cf817a849047