Merge "118395019: Hide constants and methods in StatsLogInternal" am: 0a5f26376f am: d6393758a7
am: 9e9899720c

Change-Id: I7814e47f241fc433c5baa5d45b630088e5b8876b