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

Change-Id: If745de773eb02b31e27f5f645a526ba4503470f1