Merge "Force stack dump to diagnose empty checkpoint timeout (2)."
am: 23d7c8590b

Change-Id: I375ff5e8177589dee2f93e40077cc9af0e698e2a