Merge "Provide struct-based C++ interface"
am: ccdb80d368

Change-Id: Ide55716ffc353d354fbff14ef4475982e503b723