Merge "Make empty checkpoint work while weak ref access is disabled."