Merge "Add overrides for CPU variant used by RS for Flounder." into lmp-dev