Merge "Fix the API for new flatbuffer"