Address nits in I6b4123590

This addresses the alignment and log message
comments in change I6b4123590.

Change-Id: Ic1490bdbe660d8594538a1480eb03311edf00d83
Merge "Address nits in I6b4123590"