Made the provider URI not accept empty strings

Change-Id: I654cab93f7495ada5246637b52e1299b8e8535e6
Merge "Made the provider URI not accept empty strings"