Merge "Revert "Adding the requiredForProfile flag."" into lmp-dev