Include dataAfterContent in bodyContent

Bug: 72869
Change-Id: Icbfa1ba37c3bb2ae39bb3ca80dfc7de955637537