There are no extra fields here, so no point in having a struct Change-Id: I00f38ecfb70cb5108f0822b6059c3d7189865c32