Merge "Add temp logging for zen policy changes" into sc-dev