Update formatting in maintenance/ (4/4)

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