Properly handle null URIs.

Change-Id: Ib81044686f40284bacf6ee645c671679f62be843
JIRA:CYAN-2491
Merge "Properly handle null URIs." into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0