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

Change-Id: Ice68d0de34795a23d9d7364244d564bc48a7d436