Merge "37544704 PduPersister is not doing a safe Uri comparison" into oc-dev
am: 7ffdc9c333

Change-Id: Ibfe8a044ae6dd12fbd4c204150fa410fa6867220