Fixing quantum support for v2.

Change-Id: Id7dd9d5b94b96ed183f858471b058dfb0f1a4489