Trivial: logging/comment cleanup and minor fixes

Change-Id: I944f00e1f399188ba22051c9cb7ad52b30446331
Merge "Trivial: logging/comment cleanup and minor fixes"