Update for stable/havana development cycle

Change-Id: I604f86dd5412bbeadcbe979915e428897b5e8859