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

Change-Id: I08354106b7cbb849def7a0b7ea76f704313edf55