Open stable/havana

Change-Id: I1f59561b357c03866672c2d9576568a67630a033
Merge "Open stable/havana" into stable/havana