Add undelete messages for undelete.py

Also fixes metadata blocks.

Bug: T181359
Change-Id: I09b378608aa70a5124dc5f266dd993e6db1c5e8e