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

Change-Id: I8f77c67dfc3002b2b6d5e20049e0cf715f6ff81e