updated for the stable/havana branch

Change-Id: I48414344567f7fc2af7ed534bbaed89a1ae270e0