General formatting changes.

Change-Id: Ic30703362bd848201d902215230aa0cbeeb67d07