Merge "Grant Device ID access to PO/DO delegates"