Merge "Revert "Fix flame boot failure""