Merge "Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev...
Merge "Merge "Fix NPE when reading icon for removed session." into oc-dr1-dev am: 65abebba" into oc-mr1-dev
am: 25cdef21
Change-Id: Ie12c51a826909b5224632bc26a871d984435b18a