Test: No code changes, just ran through clang-format Change-Id: Id23aa4ec7eebc0446fe3a30260f33e7fd455bb8c
Fixes: 28748255 Change-Id: I83b531cdf5e4407fd17edd72d96e6189924926fa