am 0e52f40b: Merge "Fix possible NPE in ContactPhotoManager." into ics-mr0

* commit '0e52f40b8469382613eb666fe7d5f39b4dbb4e90':
  Fix possible NPE in ContactPhotoManager.