Remove omitempty json tags from stucts Upstream-commit: 1c9e16f00f6f64f2905a52e269192e52df085a7d Component: engine