Change-Id: I9f112a0f76b9cd00d58dc2d5751b031ee056e194
this struct doesn't yet exist in upstream, but it should.