Merge "Merge "Eagerly serialize historical sessions" into oc-dev am: c7ea7eff am: 7ba9c4dc" into oc-dr1-dev-plus-aosp