AD was broken because of missing Body key

Change-Id: I66b9c2e60348b37eda717644423129a6da9f3677
Merge "AD was broken because of missing Body key"