Merge "Support parsing legacy reboot escrow data"