Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev
am: 65abebbadd

Change-Id: I5a78f799bde2926eb3f5f6f424148aaf11729c54