Merge "Protect Device Identifiers behind priv permission and DO/PO checks"