Wrapped the 2 section retrieval chunks in blocks.

Change-Id: I26e092a9b75bdc9429889bca86f23a99ad9bce7e