Merge "Revert "Fix the API for new flatbuffer"" am: 486f71253f

Change-Id: I39223c163bc33c7ec138d2537619bbfb398e4bab