Polish up PRE_BOOT notification. am: 288414e226
am: c83a4fcc1f

Change-Id: Ia436ac15ca0da16c6389c949b2646d06425be235