Merge "Don't ignore updated policies on PO/DO." into qt-dev