updated for the stable/havana branch

Change-Id: I9cb791511386b3aa30448b50328caa3007ef9bb2