More formatting tweaks.

Change-Id: I0ddbb604dce66b6b814d9129a8b68d49fa6f6711