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

* commit '0cdd4560dac5784dda169863eb844d489bdc79d5':