Merge "Merge "Eagerly serialize historical sessions" into oc-dev am: c7ea7effde am: 7ba9c4dc62" into oc-dr1-dev-plus-aosp
am: bf841692cd

Change-Id: Icbc38c7b742407ed54f3551df50502b0da695d2c