updated for the stable/havana branch

Change-Id: Icbbe65aad572307f7bc74541393fec5eb9539cc8