Merge "Eagerly serialize historical sessions" into oc-dev am: c7ea7effde
am: 7ba9c4dc62

Change-Id: I57639e4d18b04adf94d4da235cce5e957e88641e