Merge "Miscellaneous coding style and output improvements" am: 856b7fc7d1

Change-Id: I8dc99a62f7ba898bdad009f8b55f92f68fe62de6