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