Merge "Make empty checkpoint work while weak ref access is disabled."
am: 39ce7d2907

Change-Id: I9fc7a636864f1c8d8993341dcd0554a65bd6fa59