Merge "37544704 PduPersister is not doing a safe Uri comparison" into oc-dev