Merge "FM: Update FM policy files"