Merge "Support decoding inbound Delete Payload" am: 0bc49b110c
am: 4a996bc87f

Change-Id: I7abf94c9136a741c8a16b690ce4146a7bb433e40