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