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

Change-Id: I4a22c81581064af95631c9f4c6cc689cf4cb6027