Merge "Clean up split system user code for device policy management" into sc-dev