Merge "FM: Migrate FM Framework code base to new git"