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

Change-Id: I1ce0ecc825ad57b87388bddd0baa52b6b64495fa