[CLEANUP] - Autoformat to prepare for cherry-pick