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

Change-Id: I858b243ba715468546f6c0d598c1bb18ee4d4550