Workaroud for diagnostic snapshot generator

Change-Id: I3c3565c4c762371f658d09e2f548c0858e607cf7
Update accrording new flake8

Change-Id: I49b9898eb6d3770c64fb458a6b63deecd8001a39
US build tweaks. Do not merge.

Change-Id: If7f369078f5e1b559a2ec2aa9429f3759e037ba4