Change to base on havana

Change-Id: Iad7362ac8e5c6cf69ac982921b84fb826af91bf9