Merge "Miscellaneous coding style and output improvements" am: 856b7fc7d1 am: 137218a565 am: 2496a5da3b

Change-Id: I096969c481aad688838379a1c92bd501e5ba5fde