Merge "Implement Device Policy upgrade flow" into sc-dev