Merge "Handle null uris in content changed events." into nyc-dev
am: 00c9815

* commit '00c9815d942265719de92a19e243c1c970929210':
  Handle null uris in content changed events.

Change-Id: I2945895f58795dce9a439e58844b1406dec7abf1