updated for the stable/havana branch

Change-Id: Ie74047fcf3e8ca35290f4503e4881943639b5f73