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

Change-Id: I426379e1d407c0d6cb836eabbddb1f98486ee98a