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

Change-Id: Ibeb2fc434633c58094e7f16969941df9952f75de