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

Change-Id: I6aac360fe74bb5ca3e3b95dc3f2685a99da0fe2a