CANARY-5: Adding havana compatibility.

Change-Id: Idbf3264f01ed2d203068ecbbca51123902642dc2