Adapt to changes in RDF context handling.

Change-Id: Ia288922bda5a3a6d888ce12f278f0f5755df0526