Merge "BootReceiver: Report correct headers for last messages" into nyc-mr1-dev
am: 6c0d81520b

Change-Id: I8341a8f3c37cdb9655a6e163c53f1a2fcdde2e5f