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