Minor formatting changes

Change-Id: If314cf0434f8f6e899eb2be1bd34a0b9abfb9a33
Merge "Minor formatting changes"