Merge "Refactoring FBE APIs based on council feedback." into nyc-dev
am: a0a58a2

* commit 'a0a58a2fd5cbc1bb8056227bb04f276b364c6e96':
  Refactoring FBE APIs based on council feedback.