Merge "Fixed message on cmd device_policy is-operation-safe" into sc-dev