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

Change-Id: Iff55674bc989986e14d0bcea3c71bad5751d4dcb