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

Change-Id: I648a68ff30eee6a919e412fe1a12f0b171a60c3b