Update formatting in maintenance/ (2/4)

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