Workaroud for diagnostic snapshot generator

Change-Id: I3c3565c4c762371f658d09e2f548c0858e607cf7