Merge "Fix the API for new flatbuffer" am: 9ede389bb7

Change-Id: I733fe4df4a67796465556e6d89b9c0b969798dfc