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

Change-Id: I57a4f793614c12f32a5e0b8cafa98ef914f2501c