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

Change-Id: I997490d684f0309b30836bbb417e5d99ee19420b