Merge "Revert "Logging improvements for C++ / Java structure issues""
am: c6efcaa173

Change-Id: I7b7bb49c7332ba50d147cbcbe29074b98e3edf56