Added V6 support function.

Change-Id: Ie11677d0f4c7fac12238db6742e5edb0aa825333
Merge "Added V6 support function."