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

Change-Id: I12390e4bb27b5480cad7623db8ea09fa1ccc48e9