Merge "Fix the API for new flatbuffer" am: d1d4a294fe

Change-Id: I07661ca30dd04e41390b75d84a06bd022372ec87