Merge "Remove obsolete support for emulated FBE"