Merge "Eagerly serialize historical sessions" into oc-dev am: c7ea7effde
am: 17652d85ec

Change-Id: Ieb233fb57cddf68e282779ce0eb193abd1300de6