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