Android S Beta 4
Merge "Add boot event info to EventsLogParser"