Merge "Retry logs write when it fails. Report skipped event in statsd." into pi-dev am: 164a73e0cf
am: 0425263117

Change-Id: Icaab7324de5c553e963f646b7c4fec058cab6646