Merge "Add more logging for analytics dumps"
am: cd2e9fbb50

Change-Id: I7109d597ef9e0da78656e58cd12d49f0b3ea3de9