Merge "Add additional constraint in DPMS for Automotive" into sc-dev