am fabf0e0b: Merge "Fixing up the formatting code which is already merged"

* commit 'fabf0e0ba84e0cd28f459360b20386e68179cc31':