Update formatting in maintenance/ (1/4)

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