Update formatting in maintenance/ (3/4)

Change-Id: I4390c4ea12a6a626b0e6817b6446635116ca9fe3
Merge "Update formatting in maintenance/ (3/4)"