Use normal checkpoints for NotifyStartupCompleted am: 3e5c4cec27
am: 115ec773ea

Change-Id: Ie0bc27d5cd8d73de877ee5b42c87df886b68a3f2