am: 5a128c4 * commit '5a128c4f33aa38d3a35b5884519f6bd3a355512d': Refactoring FBE APIs based on council feedback.