Merge "Remove silent provisioning hack from DPMS" into sc-dev