Open stable/havana

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