Regression: Don't put content_block wrappers in API response

This was introduced in Ic4fffd3cf4ddb558dc966865034dd3398e0bf1fc
and shouldn't have been.

Change-Id: Iacc45ad3b292e645c84ee2340991fa024e50eb53
Merge "Regression: Don't put content_block wrappers in API response"