Merge \"Polish up PRE_BOOT notification.\" into nyc-mr1-dev
am: 445c01b591

Change-Id: Id326e6325e5b060af1e9417e3a6a786b5f677f6a