Merge "Omit icons from bulk SessionInfo calls." into oc-dr1-dev am: c017d299ce
am: 00c66f676f

Change-Id: I200f39ef3dd3c336abd48e53a9b93e21f48a7dc0